fix includes

diff --git a/ChangeLog b/ChangeLog
index 2246644158994ae81b775a7a4e2a49bb8d362a82..409a8832c75c54a447b61570cc56db382fdd1ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
 
 2005-10-07   Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c: Properly fix the unistd.h include
+       by moving it out of the profiling ifdef.
+
        * gtk/gtkfilechooserdefault.c: Remove a redundant (and
        unconditional) include of unistd.h  (#318211, Kazuki Iwamoto)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2246644158994ae81b775a7a4e2a49bb8d362a82..409a8832c75c54a447b61570cc56db382fdd1ff8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -33,6 +33,9 @@
 
 2005-10-07   Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c: Properly fix the unistd.h include
+       by moving it out of the profiling ifdef.
+
        * gtk/gtkfilechooserdefault.c: Remove a redundant (and
        unconditional) include of unistd.h  (#318211, Kazuki Iwamoto)
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 08a2e6caebc38112da95544e1b3d18917bf2a240..8ef9aaf3f6ceab84eb157e5ae6be2006ef1e29eb 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -78,10 +78,6 @@
 
 \f
 
-/* Profiling stuff */
-#undef PROFILE_FILE_CHOOSER
-#ifdef PROFILE_FILE_CHOOSER
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -89,6 +85,11 @@
 #include <io.h>
 #endif
 
+/* Profiling stuff */
+#undef PROFILE_FILE_CHOOSER
+#ifdef PROFILE_FILE_CHOOSER
+
+
 #ifndef F_OK 
 #define F_OK 0
 #endif